Merge changes Iaa6f0d65,I68a16b64 am: e486951a92 am: 8abb5a0520

Change-Id: I7e66156659fb88110d2a7f027d488e15499caee2
tree: a18687e4c34753777f8d55b083b8e76b9b1f352d
  1. core/
  2. packages/
  3. services/
  4. wifi/