Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev
am: c6dd9a3e54

Change-Id: I4a659f2c16358a59a1ab981e74e0b6592fbb0a76