am 095c4515: Merge "Remove unused variables."

* commit '095c451541765c7efb9d5a8152f8ef15626ccedb':
  Remove unused variables.