am d32ff7a2: Merge "Split a single large test into two smaller tests."

* commit 'd32ff7a2888eb1fba914d6841a93c653ba032664':
  Split a single large test into two smaller tests.