Reconcile with jb-mr2-release - do not merge

Change-Id: I0a3ac3cb5efeae22ac8034653d6e352e6cc5579a