Merge \"Tweak VVM error handling\" into nyc-mr1-dev
am: 3a2a2e4ac8

Change-Id: I17ddda10a2d3a0524d1205f1c4e3c0effedd46ba