Merge from Perforce
Merge from Perforce
Modify the name and description of the zone
Merge branch 'imp/config_ap_zone-17002/17003'