Update VE to master

Change-Id: I40b9389ed96485ba9da58ae98b6de3a21ae2b7da