fix vsm configuration failures

Change-Id: I8bdff1f507815f0ed9af3b4031cbf373d6ef3231