Merge "Suppress harmless clang warnings until upstream fix."