Merge "Fixed all APIs not meeting API review requirement" am: a3f1b3f15d
am: a0e1501981

Change-Id: I4fceb789ebcfff76cc0205889e9c5084c83d4471