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

Change-Id: I3c9e07e48928390a98c01299fd16d58154f34150