Make availability_zone filed not required.

Change-Id: Ia1a62d41f65b51fa32f5cbac8549622f72eac3c5