Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721
am: 8a293f07e0
am: fbda2bf9fe
am: 8e6aaf60bc
Change-Id: Ia244c2bf9f771e4b02e60cdfc3d90fda9dd0ce22
This commit is contained in: