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

* commit '481b551a95d662653e1e6c594ba9617a50f81034':
  Small cleanup of duplicated test values.