Merge \\"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\\" into...
Merge \\"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\\" into cw-e-dev am: eae242cf -s ours
am: 8b04b0db -s ours
Change-Id: I459eec39aa68d4e165264189ce051bc8b4253965