am 6522fccd: am 72f3126f: DO NOT MERGE: Remove unused variables

* commit '6522fccd3d186c2d4fb479e6626d9f1ab8dc45ba':
  DO NOT MERGE: Remove unused variables