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
Change-Id: I69ad6ab73bce7f5d39d6e34f8c489ab0a6a7bcbd