Branch HEAD

b=14043
r=adilger, umka

This is used to determine the size of a buffer that was already packed and
will correctly handle the different message formats.