Merge "[TrivialFix] Correct file mode settings"