am aeac9cd1: am 85507404: Merge "Remove dead code."

* commit 'aeac9cd1b3c9a1dfe334857e74b20ff1843ae87c':
  Remove dead code.