Merge "Update VVM API" am: ac29d38623 am: fe7e5970ac am: 21ee1e2b54  -s ours
am: 42e3665651

Change-Id: Ie4f0da1a0b9ce1e256c5d43b59ae0244e081019b