am b3086668: am 6cc39a47: am 613d2066: Merge "Fix unused variables."

* commit 'b30866681475aff8fd23841dbadf1d39e0001e20':
  Fix unused variables.