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

Change-Id: I3afa60bf8978d750c7072128e9f5e87c5d624b36