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

Change-Id: I124a001cde37f9c3bd8cdfc4a59ccdc250fd24e5