Update VE to master for labs

Change-Id: I1f507802e73b20063a6d29c008bfd56f05547c8a