Reconcile with jb-mr2-release - do not merge

Change-Id: I51d47e30245aea615f08d9692c0b1fe9f00390ca