Merge "Create legacy /data/system/user directory." into nyc-dev