Merge "Fix the comments left on aosp/1481197"
tree: c0c21f3e3dab269615c49ee0af0ffeb360f12b08
  1. core/
  2. services/
  3. tests/