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

Change-Id: Ica640e49c31850cb63a71d62f8feefa08ca077bf