Merge "[CPS] Configure roles-wrapper dependency"