Merge changes I289d935f,I0121a4ac am: 8366a33efa

Change-Id: I7c413c9e1f2efc3aba55453c6b98bf682f3d4116
tree: ee94302cfc7b4035f2638fe55a49d6cfb29d45e2
  1. core/
  2. packages/
  3. services/
  4. wifi/