Merge "Test Data Stall with unknown detection type." am: 43fbab7444

Change-Id: If62bf0f152893d904b79320354267db1ce3cc320