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

Change-Id: Ib995f82ee38a7105b28b5cdccb04d73dc6f43b81
tree: 6c456c5dae2ce020849224577879a5c0292f8b9a
  1. service-t/
  2. tests/