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

Change-Id: Ia418392bcbab16d2c02689fdc79138b1cee304ab