am 9cad1985: Merge "Fix errors caused by unused variables"

* commit '9cad1985880f700be3150f05ca3539444da850d2':
  Fix errors caused by unused variables