Merge "Fix uid map to be simpler and fix partial bucket." into pi-dev
am: 203bbbf942

Change-Id: Id9073af7625257072d6383aa174e9e5f21dc6216