Merge "Add labels and descs for CDM permissions"