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

Change-Id: Iff920fa574533c1c22a8c1408291f43e81ab7a2f