Import revision 41655e1cf1451b788f6437c91ec74bcecd2192b7 from FreeBSD.

Change-Id: Iba2df7def1a28d101a8b6667bda211b9685b35c7
7 files changed