Updated branch for vendor

Change-Id: Ib31d3a548e6b2abc39e15f9fad34372021e4bb15