Reconcile with jb-mr2-release - do not merge

Change-Id: I89789e5cffac73fa8a83bfb4007d812efa26101d