Merge "Dont crash when test devices send bad messages. tested this on master...
Merge "Dont crash when test devices send bad messages. tested this on master with go/ag/4552612" am: 5ee35baa
am: 8aa30e66
Change-Id: Ib141562a4d294d9a92f8ee8921e96810763ca468