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

Change-Id: I6765f8f1401d75061c1ce4942c67bd6b4a74d286