Merge "Use a log tag that can be enabled in ManagedServices subclasses" into main