Merge "DO NOT MERGE Fix: Send Deactivate SMS after Native VVM deactivation" into nyc-mr1-dev