Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken"...
Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: 938a989c" into nougat-mr1-cts-dev
am: 5997e170
Change-Id: Iea145d7c14cd6b8550ac509645843de5dec91173