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

* commit '5047ed9964370b08320e6ac494cc80ff488ac620':
  Remove unused variable.