Merge "Fix NPE when UID doesn't exist." into pi-dev
am: 31e1171fd8

Change-Id: I2426e4d9d105637874aa51885b728ce3962f0698