am 6cc39a47: am 613d2066: Merge "Fix unused variables."

* commit '6cc39a475dd8eaac04438b393559612ff7cd840f':
  Fix unused variables.