am 65a83bdf: Merge "Reserve some AIDs for OEMs"

* commit '65a83bdf2ea1643449294a23a450e5a8a5b5058c':
  Reserve some AIDs for OEMs