Merge "Address comments on aosp/1448415"
tree: 72f0be1d0e2ccfe8273a29d20390dd41ecfff6ae
  1. core/
  2. services/
  3. tests/