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