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

Change-Id: I3ab4d9c30cec6d454942c80415d56b7e6e3423b1