Allow graceful shutdown on Ctrl+C

Change-Id: If02a849af2b0dd471ffa078a53864b3cf751b9bb
Merge "Allow graceful shutdown on Ctrl+C"