Merge "Add timeout for calling into role controller service."