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