Update VE to master again to pick up b21fe5f

Change-Id: I23471505bb26732e3a280e68e63023825e73eb8d