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

Change-Id: I152d9a8edbb7ac9f7e8589afaf8f154352bfe563