Merge "Add resource based mechanism to grant default permissions" into nyc-mr1-dev