Merge "Merge "Address the API review comments." am: 322ff163 am: 904826d2" into pi-dev-plus-aosp am: c71071cf Change-Id: I858ca48ed78a648beea729e4ddf3caacdf3b7740