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: eae242cfe8  -s ours am: 8b04b0db2e  -s ours am: 24d94b8aa0  -s ours
am: 5d350d4864  -s ours

Change-Id: Icb509e0ef2b86302b6a9574cbf6de8e6d87d5d3f