Merge "Don't call exit() with threads running" am: b7383f2c5f

Change-Id: Ib8b6c1d12000bdc75461774d9aff2feb30afbcd4