Merge "Remove @FlakyTest from CompatChangeTests." into sc-v2-dev