am ac4d8b31: am 6ade0417: Merge "Remove dead code."

* commit 'ac4d8b31d4c7785ccaed28977e05e158d554ce38':
  Remove dead code.