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

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