am 6984e6dc: am de180fc2: Merge "Remove unused local variable."

* commit '6984e6dc97c1a3b7e018efecddc6cb581a6a383a':
  Remove unused local variable.