Update VE to master

Change-Id: I5c5f900c962db70e70066a8584247044f89f4f91