am cb72f364: (-s ours) DO NOT MERGE: Remove unused variables

* commit 'cb72f3643f475b70089e79108e16621787262e2b':
  DO NOT MERGE: Remove unused variables