Merge "DO NOT MERGE Fix: Send Deactivate SMS after Native VVM deactivation" into nyc-mr1-dev am: 46c7b6bf5f
am: e1713f7fed  -s ours

* commit 'e1713f7fed14e1bf959e4a225e782f060c0d2cee':
  DO NOT MERGE Fix: Send Deactivate SMS after Native VVM deactivation

Change-Id: I3244fa14c508cb850d9fae0acdbaff9de445488b