am 8e66265a: am acc0a23a: Merge "Remove dead code."

* commit '8e66265a17e5e13843bd59282b1feacdae4b4b41':
  Remove dead code.