automerge: 00e821a * commit '00e821a8608efdc19041bdda1e832d3d4b3c29e2': Remove references to persist.sys.language/country.