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

Change-Id: If33d62bf32f60ededcb95587a01309b36c329595