Merge "Packing the struct to work around llvm bug."