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

Change-Id: I2ba1d502edfeafbf94c84f0154e0ff05b90bf6ab