Merge "ImsServiceEntitlement default values missing"