Merge "Test Data Stall with unknown detection type." am: 43fbab7444 am: 2a898a5d7a am: 342ea45a67

Change-Id: I0fbbbd729451d598696ca6b55df9a8d965c65cfd