Reconcile with jb-mr2-release - do not merge

Change-Id: Icf2700c6f34ca44ac74b72334809e3e5d3f14917