Merge "Fix clang build by removing unused locals."