Merge "Disable two test files"