am 48ecb3a6: am 58b52fb1: Merge "Remove dead code."

* commit '48ecb3a64c56fb380cb642726787d1809d5ab1e4':
  Remove dead code.