Merge changes I9ad4ce81,I360d539e am: f34d09ac30 am: 4062ac81be
am: 84c878ecc8

Change-Id: Ieeb3222246c63292a75ad91e9c867eaedcad8f90
tree: 1f71e45ba99ede539caa23f41081602508268fda
  1. core/
  2. services/
  3. wifi/