Fix for EXP-201 -- "Clean shutdown"
Fix for EXP-201 -- "Clean shutdown"

Reviewed by Brad and Mani.

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm