am 0b0e0eae: Merge "Small cleanup of duplicated test values."

* commit '0b0e0eae8cbe3406dfbf14d42eb1229037cc30df':
  Small cleanup of duplicated test values.