[automerger skipped] Merge changes Iaa6f0d65,I68a16b64 am: e486951a92 am: 8abb5a0520 am: a96f068996 -s ours
am skip reason: Change-Id Iaa6f0d65cab556c24b0a9010427de8e6a02836c1 with SHA-1 7092cf164f is in history

Change-Id: I306a831e47c08ac37de93285763500b73a4624ec
tree: b4f5ab71cdc753e925a77c07bbdab6e3cf883c6f
  1. core/
  2. packages/
  3. services/
  4. wifi/