Update VE to master

Change-Id: I62e3a16a69a8a9cd243e562159d979640160e8b0
Merge "Update VE to master"