Move AP to zone
Merge from Perforce
Merge branch 'imp/config_ap_zone-17044/17045'