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

Change-Id: I957edb9e9f7323234aebb942e45dd4e2ef6bd98d