am a336cbcd: Merge "Reserve new UID range for OEM."

* commit 'a336cbcd5c05e693d5c52951ce2ee49dd8c617fe':
  Reserve new UID range for OEM.