Import revision 0d367b12ca9c1a96d76d882f4d2c058e5b95bf1c from FreeBSD.

Change-Id: I42933f8c4a0b1b34cc26044ccc20972ecf7441ca
2 files changed