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

Change-Id: I786eb5c594b325bec934aa0ca4432405dac39db4
tree: 3c4c7dd715860f346e80dcfe6265fc9c4c996045
  1. core/
  2. packages/
  3. services/
  4. wifi/