Merge "Don't match locales with different scripts in ResourceFilter" into nyc-mr1-dev