Merge changes Ibff278a6,If6d537a3 am: 33e236823f
am: a865058628

Change-Id: Ic51f3b32375378ff74bdd54d1f36569b277fc80f
tree: f00e8851217fe45bd5527b0b0bc607f2bbca6aba
  1. core/
  2. services/
  3. wifi/