Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev