Reconcile with jb-mr2-release - do not merge

Change-Id: Ifffea6c8ba5c10c40c6c3f2ba2d6de8b5f28cdac