Update VE to master again again

Change-Id: I6c1cde74155748b0f540fdac0d1406c8ccfa2176