Merge "Address further API council comments." into rvc-dev am: 93306df869 am: d5ad23f67b am: 329a7ec61b

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