am c7e48719: Merge "Remove references to persist.sys.language/country."

* commit 'c7e487193aed3b102d6e55e0817de6e0460e0236':
  Remove references to persist.sys.language/country.