am 6dbbcc57: Merge "Fix clang build by removing unused locals."

* commit '6dbbcc57a00e6b44488e595d128e27168a939a02':
  Fix clang build by removing unused locals.