Merge "Make ManagedServices intents immutable" into rvc-dev