Merge "Dont crash when test devices send bad messages. tested this on master with go/ag/4552612"
am: d9d861994a

Change-Id: I8e1560d051e75fcf285c5aee372f1fd391ad4d2c