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

Change-Id: I8c2fd056e6eea6c8d818aa44ced9421f84f64fe5