Integrate FreeBSD r335189 for -A option. am: 4d60a2217e am: 5c6235eb93
am: 93156a8e99

Change-Id: I393cbe2a4ebfb02d0b9281215105c88f85f644c7