Merge "Properly align a packed structure."
am: 24257dda48

Change-Id: I66d07aab4dfa72afe44270d866514102f660aab6