Merge "Update permission strings"