Merge "Make sure we can encode the size of the codec specific data in a single byte."