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

Change-Id: Icabdf5fba2bdced2fbb6855e237b875f35ea0475