Merge changes I794a24d0,Iab32b2db am: f46d3aa4bb

Change-Id: I03f6b9e521793b92f83a21583a2e53fb1d31fba1
tree: 30355d45daec8a4ae5e1baffde7906ec5f284a57
  1. core/
  2. packages/
  3. services/
  4. wifi/