Integrate FreeBSD r335189 for -A option.
am: 4d60a2217e

Change-Id: Iada05bb3dc7acd2b4101d26c4a05ece77754a42e