am 73757035: Merge "Fix StringTest#testCaseMapping_en_US."

* commit '73757035f6cdac0cd801d72098d9db9a565dbaaa':
  Fix StringTest#testCaseMapping_en_US.