Merge "Fix ReplicationAndSnapshotsIntegrationTest failure"