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

Change-Id: I3d188c4d061783ef7007226ebeb0e3de7e1c76c9
tree: 540b01b06d227aabdadc508ff2c29eba28b3f542
  1. service-t/
  2. tests/