Merge "[CPS] Add roles-wrapper dependency"