Merge "Address further API review comments" am: b279ec51b6 am: cf8e06c0ac am: 92189b6e21
am: 7776b49c13

Change-Id: I0ae1025d7382ca0dca3cf69d7362df38898ee048