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: 2394e3871b  -s ours

Change-Id: Idf8a2dac00af288b92857ffeb5ce66c8c4219dd8