Nicer exit on CTRL-c

This change avoids stacktrace print on exit using CTRL-c

Change-Id: I03401625c26d6d2b6301c8d6a60ed4a581741768
Merge "Nicer exit on CTRL-c"