Merge "Fix clang 7.0 warnings."