Import revision b60894b10adb071a8dc2b6fea5f9867c24bc9c47 from FreeBSD.

Change-Id: Ida6851c44456928d45a391352dd4e552dfac93ef
3 files changed