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

Change-Id: I6b15cc75923cd712ca62302b8f797899ad43ad00