Merge "[SP16] Address comments on aosp/1172143" am: f4eaaa2415

Change-Id: I9c826c08320e112466dea0d2628f3447ebcb7d02
tree: a23b82163075677b77cb7458450b1b3764d6d18d
  1. core/
  2. packages/
  3. services/
  4. wifi/