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

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