Import revision 55bd3d1288913467e83041b9c05d54c4f575bc5d from FreeBSD.

Change-Id: I2c7ac2360d60cf44faa895822be0e7987558464d
2 files changed