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

Change-Id: Ifaf3eb3035bc9be846a9edd3e64cbf3bf6f95f64