Dispose of vendor restrictions

Change-Id: Ic365867b2c921615020b1a4d7fe988b7528b3c03