Reconcile with jb-mr2-release - do not merge

Change-Id: I61c2e7abaae34978e88c581f67e72bf45d4ebafb