Merge "Fix packing of values at offset 16."