Merge \"Move grantDefaultPermissions back to onNewUserCreated\" into nyc-mr1-dev
am: 9cf5bf04d2

Change-Id: Id776e0b5f87bf5325a9bc48e198d168c9c555c18