Merge "Remove thread shutdown logic."
am: 5730cc10c7

Change-Id: I1320002ddc3b8aee8764eb0e6f2fdfd86b83bf4b