Merge "Address comments from aosp/1298476"
tree: ddf790bd95bb519dc6c0187b9b695deadc2119b2
  1. core/
  2. packages/
  3. services/
  4. wifi/