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

Change-Id: I84c1b55e99bf89c818c365f4954d9e3921904636