Revise VVM enabled setting strategy am: 97d48c2d42
am: 797427630b

Change-Id: I015d986bc98114d1c00895b031c68febe4fe6bbc