Merge "DO NOT MERGE Defer VVM activation/deactivation until device is unlocked." into nyc-dev
am: 21b3440727

* commit '21b3440727916841e3fdcc91bef46343b5abad0a':
  DO NOT MERGE Defer VVM activation/deactivation until device is unlocked.