Merge "Update permission names." into oc-dr1-dev