Merge "API review cleanups." am: 6dec06ab17 am: ed5c1e18e1 am: 68202d128a

Change-Id: I5edb9bb024c69bb1b256c330051172e9234ad4f3