Merge changes I34842acd,Icc6c4d6b
am: 5312d0be3e

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