Merge "Address further API council comments." into rvc-dev am: d3a0721fb5 am: cc9cab6311 am: 7fc8220a53

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