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

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