Update vendor branch

Change-Id: If93f91481648cf2d8f88a9056be427965690f44f