Merge "Merge "Address API feedback." into rvc-dev am: a5d63927 am: ec17c0a3" into rvc-d1-dev-plus-aosp