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

Change-Id: I145f70e1468eb53bf0ab955ff096ea795797bd3b