Merge changes from topic "sp04" am: c621ac4b44 am: dfb59a3bd4

Change-Id: I67f56321014c282cfaf86863a988fd28f9cb124d
tree: 42f61da4de62d5548a8b2e4dfdbbe6dc9d79be4a
  1. core/
  2. packages/
  3. services/
  4. wifi/