Reconcile with jb-mr1-release - do not merge

Change-Id: Ic678a9ac8903330314ffcf430137c2873a34c4ce