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

Change-Id: I5d2991ced189f98aab1a28b847d80085ab01f235