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

Change-Id: I7364fbcc09eaf47a3c90def9fd03b5f9f1d92a7d