am bad12166: Merge "Deprecate unused APIs"

* commit 'bad12166190a7e8087eb5db0ae8df9a4e5843fde':
  Deprecate unused APIs