Merge "Use requestType, not service type for interrogation check"
am: be49b65d15

Change-Id: Ia6b9c471d9d53c1d59b96e352b100f7238656df1