Merge from Perforce
Fix the script issue in the ap zone test suite