am 39ce837d: am 9f2944aa: Merge "Remove dead code."

* commit '39ce837d1e84cd1ebf0610759ad5b76009c7461e':
  Remove dead code.