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

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