Update VE to master to pick up 9938186

Change-Id: I9facc76bbaf8fdb00c9fb670d4777d24101675ba
Merge "Update VE to master to pick up 9938186" into wmf/1.22wmf9