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

Change-Id: I9683c9616e524013eda818e34d817d636ff1f365