Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721
am: 2f60c6dddd
am: 6cc97dc6aa
am: 716d91c254
Change-Id: Ic84ce14cff6793b410b715a1f269f7de023b9ef5
This commit is contained in: