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

Change-Id: I2c52841d2a75ed420e168eb4820fba6c6e46e302