Merge "Remove ImmutabilityAnnotation from services" into main