Update VE to master

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