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

Change-Id: I5ffbdc1a3993d684898a61c818cfec1a8ff8ce4b