Reconcile with jb-mr1-release - do not merge

Change-Id: If22290df508e894617f0acd115fe0661069dcd41