Merge "Test ImsService updates for dynamic ImsService"