Merge "Fix a UidMap crash." into pi-dev
am: 9859c29a8f

Change-Id: I48706f97dd6c75a425c60a3d0b1db314c10418d4