am e23cb4aa: am d2ad744e: Merge "Fix LocaleDataTest build breakage."

* commit 'e23cb4aabce06b855e6270061a48d8c872218c38':
  Fix LocaleDataTest build breakage.