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

Change-Id: Iff336b51ffc2893168e67406d96bc6dd97735b7e
tree: 1f23776b45efdf9bb4c28561979d86142927003e
  1. core/
  2. services/
  3. wifi/