Merge "Suppress clang 7.0 warnings."