Merge "Address further API council comments." into rvc-dev am: d3a0721fb5 am: bad3318c8e

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