Merge "specialCrossUserGrant should not be false by default for secondary users."