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

Change-Id: If09a200e9efa35ecc8611d087a7ba63f99f2a330