Update VE to master to pick up 9938186

Change-Id: I9facc76bbaf8fdb00c9fb670d4777d24101675ba
(cherry picked from commit 1ec2c5a13b4be21bd1435d708142f7f52de829f2)