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