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