Merge "Use requestType, not service type for interrogation check" into qt-dev am: 588c2c0e17
am: 02c6fcfc5f

Change-Id: I7f3de2c0c5264427ab7f9d655e187b7a642b1dd0