Merge "Suppress or fix clang errors before the fix from upstream."