am 65734b98: am d5478592: Merge "Fix API council review comments. Also hide certain APIs(2/3)." into lmp-dev

* commit '65734b98427c6aa6a005070f268d563f6bc884d4':
  Fix API council review comments. Also hide certain APIs(2/3).