Merge "Don't call exit() with threads running" am: b7383f2c5f am: 1ae9099377 am: 3aa3badfee am: f8bdfd1772 am: 18a8547c58

Change-Id: If41f3440f8ab5254e2a41f1c103172023ce011bb