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

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