Fix API council review comments. Also hide certain APIs.(3/3)

b/17006825

Change-Id: I4b0d7a2bf805fb611d34a512f46360f4d757989d
3 files changed