am 85538671: am 71f9ec27: Merge "Resolve canonical package path before writing...
am 85538671: am 71f9ec27: Merge "Resolve canonical package path before writing it to packages.list." into mnc-dev
* commit '85538671':
Resolve canonical package path before writing it to packages.list.