Reconcile with jb-mr2-release - do not merge

Change-Id: I61c47285d236337a033e001c3b84a9631895bc5b