Merge "[MULTICLOUD] Changes for Jakarta release"