Ensure that a AZ is returned. There may be an edge case after a migration that there is no AZ configured. Change-Id: I56c33f5f331781c1874b8d3fed73f6c2ad90095c