Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

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