Merge "Fix unused local variale warning from clang/llvm."