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

Change-Id: I769311bf9c657dab10cfcd150617b3a8ddefe41a