Merge "Remove references to persist.sys.language/country."