Merge from Perforce
Fix the issue in configuration ap zone test cases