unfiy vendor hack

Change-Id: I257054ee8b33ae43feaf3e0caecdfae9bc35c3bb