Merge changes from topic "sp04"
am: c621ac4b44

Change-Id: Ib2b96e64074a575c4d1a682e34bf6682c2fe4830
tree: ca838059b046c6d63e60005aab80da137b0366b2
  1. core/
  2. packages/
  3. services/
  4. wifi/