new vendor branch

Change-Id: I50bb05d1f25e15aa8c68fa28d26c6e377b4433bf