Merge "Opt out of clang till issues are fixed"