Merge "Remove write permission from file mode of top-level user dirs"