Revise VVM enabled setting strategy
am: 97d48c2d42

Change-Id: I4fa795408356d9fcec2a702f3390c488d13615ee