am 59c24c79: am 095c4515: Merge "Remove unused variables."

* commit '59c24c790ab04127330d58459ceee1dcd6dd3ab1':
  Remove unused variables.