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

* commit '60d2f35cbd11cdb43c24a1688c93677ab682e4eb':
  Remove dead code.