Merge "Fix alignment after variable-length data."