Merge from Perforce
Exploit new method to check the zone UUID which AP exist in