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

* commit 'd6520cf95869eb7d694f9d79abc47de1e2052d52':
  Reserve some AIDs for OEMs