am 4ec799d4: Merge "Remove dead code."

# Via Android (Google) Code Review (1) and Nick Kralevich (1)
* commit '4ec799d4c6de7e626363659508f21ee5c3c173aa':
  Remove dead code.