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

Change-Id: I8d84ac3e68fb83748601502c4696e7f0c476ff58