Merge "msm: qmi: Match service version and instance during lookup"