Merge "Address comments from aosp/1298476"
tree: 94a77cc937898087a9bc2b600d62ab0c0dfca448
  1. core/
  2. services/
  3. tests/