Reconcile with jb-mr2-release - do not merge

Change-Id: I3d0094cc82fd9fcfe3f734d0e866375cea07c195