Merge "Check device_owner with actual availability zone"