This reverts commit 71a7eda44b6da00c05bd3e136d0465086c30e721. This is breaking the gate due to the change in the az name. Change-Id: Idd7d1aab113f3d4aba8b1deb6e5dc3871a75aa29 Closes-Bug: #1716247