Merge "Suppress benign clang warning,"