Merge "Fix file permissions from Ic7fc3bd836241dce8f296237bbd80ed3e4d1ee0d"