Update VE to master again to pick up b21fe5f

Change-Id: I23471505bb26732e3a280e68e63023825e73eb8d
(cherry picked from commit f451ef8a0e42f4ec3f1348fbc8eb20dff1bf04f3)