Merge "Suppress clang 7.0 unused-private-field warnings."