Merge "Proper grant default permissions to default SMS and Phone" into nyc-dev