Merge "Make persist.sys.locale public-readable."