Merge "[automerger skipped] Merge "Test Data Stall with unknown detection type." into rvc-dev am: 01f7568231 -s ours am: 8692730679 -s ours" into rvc-d1-dev-plus-aosp