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

Change-Id: I8a373415195858d489051b319a5b4122860c0a81