Merge "[SP16] Address comments on aosp/1172143"
tree: 67682c7e3e3b6b91635b81420c4a550ba5053bfc
  1. core/
  2. packages/
  3. services/
  4. wifi/