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

Change-Id: I7ba72441de3b5c1aa8264e079a2808450036380a