Merge "Add support for persist.sys.locale."
automerge: dca2332

* commit 'dca23321c6f5f0713e7910158f4c874812975077':
  Add support for persist.sys.locale.