am 87a8f1c3: Merge "Clean up a test slightly."

* commit '87a8f1c398e995fd092be6aed27860ecc61d53d0':
  Clean up a test slightly.