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

Change-Id: I1e5f377e655f72b8d2e497e83cf4207f5b786e01