Merge \\"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\\" into cw-e-dev am: eae242cfe8  -s ours
am: 8b04b0db2e  -s ours

Change-Id: I459eec39aa68d4e165264189ce051bc8b4253965