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

Change-Id: I87946f56204dd0e5c5779a8e0659cb88a1503d5d