Merge "Better file permissions enforcement on system keystore."