Add support AOSPZ Vendor