MFC r255090 and r255128:

PR:		kern/181728