Merge changes I34842acd,Icc6c4d6b am: 5312d0be3e am: 4036bb43a0

Change-Id: I801ab058c34ed261f6ca4d100927a0cd89fd8e02
tree: 1f804a10e130304f019fcec57d5f7580209980de
  1. core/
  2. packages/
  3. services/
  4. wifi/