am 38cc84de: Merge "Remove unused variable"

* commit '38cc84deceaf7bc9fab898cbcb37523cfba2bb66':
  Remove unused variable