Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" am: 2ca4e142bf
am: b15ec9f17d

Change-Id: I39c2f9c69eb467bd46333cb1c8eb4a6616af2ebf