Merge "Test Data Stall with unknown detection type." into rvc-dev am: 01f7568231

Change-Id: Ia40dcc8e427a9058b6e6001a4851c1f4a6e9fb84