automerge: 1194e75 * commit '1194e754a95e1fa5d4eba6d0bca109156dd4df94': Add support for persist.sys.locale.