am 23bac12e: am df01d12e: (-s ours) am 45ca3d54: am a336cbcd: Merge "Reserve new UID range for OEM."

* commit '23bac12e4b963d716b123ed9394898460f5c9235':