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

Change-Id: Id716af997b29350c4600ae941107e96d27f1b0af