Merge "Fix file permissions to remove execute bit on ordinary files"