simplify vendor props

Change-Id: Id272156109f3ac90ed28966b9112a3fa5099d4c1