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

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