Reconcile with jb-mr1-release - do not merge

Change-Id: Ib6d98680f4ca7dacc33209363896f2cdff2127ed