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

Change-Id: I3143065e2fe55bfb4bae97b5b6423dede66de3e4