Merge "Move grantDefaultPermissions back to onNewUserCreated" into nyc-mr1-dev