am a2bd0e55: am 02aca27f: Merge "Allow OEM to specify <unavailable-feature>." into lmp-mr1-dev
automerge: d63dd3c

* commit 'd63dd3c75b2d6d4af2b687e9a58822a983d97acd':
  Allow OEM to specify <unavailable-feature>.