am 72f3126f: DO NOT MERGE: Remove unused variables

* commit '72f3126f6499cd9017b367f5c7e61cab1d99d080':
  DO NOT MERGE: Remove unused variables