Merge "Report normalized package name as default key" into oc-dev am: 0560127e9d
am: bf3ad99a38

Change-Id: Id4d90c665262151bc4413a8143cd131c1d069543