am d82b1c3b: am 9d8721f8: Merge "Remove dead code."

* commit 'd82b1c3bf2abbc1582c90362267650cf05d38cd5':
  Remove dead code.