Reconcile with jb-mr1-release - do not merge

Change-Id: Iaa46c18caa7ba6e7e82153b005d535fd63a3efb8