am cafb413c: am 59c24c79: am 095c4515: Merge "Remove unused variables."

* commit 'cafb413c2d4ec69ac111df76ea264f8594065398':
  Remove unused variables.