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

Change-Id: I522f0af1f987b4d0c218a03005c47893d59d8911