Merge "Add valid bits check to adts header parser" am: b622299482
am: ffb999bec4

Change-Id: I9769e9e7152cc5294f3b1a925487938803f40878