Merge "Address comments on aosp/1612040."
tree: f0491d9978cbcd6cdf6c2059847a1ceef4379c92
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS