Merge commit '840f0fecd87357cadf4b2a0ae96d30b457f89729' * commit '840f0fecd87357cadf4b2a0ae96d30b457f89729': Clean up some permissions.
Merge commit '840f0fecd87357cadf4b2a0ae96d30b457f89729' * commit '840f0fecd87357cadf4b2a0ae96d30b457f89729': Clean up some permissions.