toroplus vendor stuff

Change-Id: I5594a554d23cedc3940b0bba8bb070b939f8b008