Fix vendor props

Change-Id: I600aa7782b5d36f4b6488ade8a0679684e36a337