am 0ae4f61e: Merge "Remove tests of dead code."

* commit '0ae4f61e1a534b9ef9d093df3393185f8277abff':
  Remove tests of dead code.