Reconcile with jb-mr2-release - do not merge

Change-Id: Iaf7449c8a3d44b7d692291a65c03ec59c2d2aedb