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

Change-Id: Ifffd0bab9123c37df7c9abdbf166e32ca9850835