Update VE to master

Change-Id: I27a35f4ec20095bb85ae5975de6e10b0305a4bcb