Merge "Address further API council comments." into rvc-dev am: d3a0721fb5

Change-Id: I30c12bd1f44911306ba543cd1ad1e78cef35e0c6