Merge "Merge "Adjust code for API council feedback" into rvc-dev am:...
Merge "Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe37 am: 8a293f07" into rvc-d1-dev-plus-aosp am: 81299ce7 am: 106cf460
Change-Id: I9518bc4eb9dc23aa34eae082e5426cae6a6ca4e3