am 9d1b1222: (-s ours) am 75a78bd9: am cb72f364: (-s ours) DO NOT MERGE: Remove unused variables

* commit '9d1b1222d288a2ab18870f47ed1fd8f91f5f171b':
  DO NOT MERGE: Remove unused variables