Update VE to head of VE wmf/1.22wmf17 branch

Change-Id: I94645d3262e07d38ca5460ed5e3cc6bf0a79b2d4