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

* commit '36dfe06f81fc7b5ce8d9478d30b4d49ac70d4525':
  Fix clang build by removing unused locals.