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

* commit 'c79e511d828cd3dfdd79af40ce5be556a4c2ff9b':
  Small cleanup of duplicated test values.