Reconcile with jb-mr1-release - do not merge

Change-Id: Ie7e896317ed95f87808a7467332685fb38e4ae1b