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

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