am 91f68a47: am 5d22a5b5: Merge "Remove dead code."

* commit '91f68a4735e7ca9facaf0bad45a97e7ea25213c4':
  Remove dead code.