Reconcile with jb-mr2-release - do not merge

Change-Id: I2a3754df164d9a9b56a1db167e0f10369e92efbe