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