Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3fbcd93e4cef710bf1562bc7844f4a62f3146e02
tree: b13d2f89aed526f0e40a8b90be386b47f0b84be6
  1. core/
  2. services/
  3. wifi/