Update VE to master again

Change-Id: I437827544c8fdf40ad7954d39091fc5ef6d21dc6