am a80eb138: am 1a608148: Merge "Extract non-API locale tests into a separate test class."

* commit 'a80eb138198722c5cd3b3ba66cd5dab33e912f3a':
  Extract non-API locale tests into a separate test class.