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

Change-Id: Iedf6be09a1ce4e2a4627d8165a30827734b0bd91