Add availability zone to service instance schema

Change-Id: I0d1365650579488c29cf2d362c874df3c548742d
Partial-Bug: 1342969
Merge "Add availability zone to service instance schema"