Update VE to master again to pick up 10fd1a3, 1875851

Change-Id: Id9c6f2021d486bd97935c0d665b8ecf108ba921d