Merge "Address API review feedback"
tree: bafcbd4f2690f8f351ecd62d3b42e74b250de4f6
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING