Merge "Merge "Address api feedback" into rvc-dev am: 7d5dfe8f am: c4e7f343" into rvc-d1-dev-plus-aosp am: 8d818d21 am: 31240ff5 Change-Id: Ib313539010c2fd20f62602fcab162e4e977231cf