Update VE core for cherry-picks of If67fe35b and I80d0632fd

Change-Id: Ie0331b391a772218ce83395fb90467ef0819a1e2