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

Change-Id: I801b129aa66816d9639f9b089ca35fc82caf69fa