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

* commit 'e713f57a6ebbeb6571226422c42c2c3d6c113a9a':
  Remove dead code.