Merge "Set umask of system server to 0077"