Issue #3291000 by Xiaohua Guan, yas: Refactor the source code based on Drupal best practices (undefined variable $availablity_zone)
Closes #3291000