Merge "Merge "Address api feedback" into rvc-dev am: 7d5dfe8f am: c4e7f343" into rvc-d1-dev-plus-aosp