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