Reconcile with jb-mr1-release - do not merge

Change-Id: Ie5b35b4154bf8cc096620a99382b5137ebb5ca81