Merge "Fix clang compiler warning."