Merge "Merge "Address further API review comments" am: b279ec51 am: cf8e06c0 am: 92189b6e am: 7776b49c"