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

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