Reconcile with jb-mr1-release - do not merge

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