Merge "Remove unused variable." am: 2649cba0fb
am: 8e1aad2bb9

* commit '8e1aad2bb90119e2726f3d6f13e43181960fda36':
  Remove unused variable.