Merge "Fix the comments from aosp/1717479."
tree: 590770b93ad22ec52d375a72ec79479fe4d8776b
  1. core/
  2. services/