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

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