am 613d2066: Merge "Fix unused variables."

* commit '613d20668a28f9dc970949c9efd2ca7f61bed6f4':
  Fix unused variables.