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

Change-Id: I77e12f9634f52959645492dd6cfab657fdc23f8e