Merge "Add support for persist.sys.locale."