Merge "Suppress benign clang warning,"
Chih-Hung Hsieh authored
5f4c07a3