Merge "Address api feedback" into rvc-dev am: 7d5dfe8f am: f87b826a am: c23b4312 am: 62a97e20 Change-Id: I5f2435445583ed2ff8300e69d36bcd5036d67f15