Updated availability zone information

bug: #1107419

Change-Id: I915a3b8fa102d95822b9354f7e5ef28c6c861ee3
author: diane fleming
Merge "Updated availability zone information"