r24944: Merge acct_expiry fix to release branch.