Merge "Support Dynamic ImsService Querying"