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

* commit 'df01d12e14a7dc819f05bf0b1c6c137b3c105d5c':