Merge "add more test scenarios for filter serviceInfo by service model id"