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

Change-Id: If18c6e76195097f678d79eb538afb3f757a3b986