Fix file permissions from Ic7fc3bd836241dce8f296237bbd80ed3e4d1ee0d

Change-Id: I5d147c6baa034057f95e69b78811b9011cc4355e
Merge "Fix file permissions from Ic7fc3bd836241dce8f296237bbd80ed3e4d1ee0d"