simplify vendor props

Change-Id: I46b9bec5a2e2ec8e0fb32421df90ebdc09f0ab7d