am 62bb354d: (-s ours) am 6522fccd: am 72f3126f: DO NOT MERGE: Remove unused variables

* commit '62bb354dcdbe9fc93344a2727dc89720e420db81':
  DO NOT MERGE: Remove unused variables