MFC r255090 and r255128:

PR:		kern/181728
Merge remote-tracking branch 'upstream-github/stable/9' into stable/9