am 85507404: Merge "Remove dead code."

* commit '855074043144e74156972e7a3416808dc6696452':
  Remove dead code.