Reconcile with jb-mr2-release - do not merge

Change-Id: If6ae5387934e31b848fa0a8d34d3a0d38be4a77a