am aa3ae615: am 72c870f5: am 596a565a: Merge "Remove some unused variables."

* commit 'aa3ae615d29e8371f873ec870d10e20f67d7c33d':
  Remove some unused variables.