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 am: 24d94b8a  -s ours am: 2394e387  -s ours
am: a36c8d5d  -s ours

Change-Id: Ib1d5db4614f1f7dec19c809a5f56b077f0f89484