Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ida52d4ffe46a6805df540f684465dcd46db71945