Merge "Force alignment for GrantorDescriptor struct."