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

Change-Id: If08f129615c197a4b66642f1a271a620d431f393