am d098e1db: Merge "Update LocaleUtilTest in CTS" into jb-mr1-dev

* commit 'd098e1dbe558fafb13e79a30085c600d87d34221':
  Update LocaleUtilTest in CTS