Prevent holding stale Thread pointers
am: 81c170f

* commit '81c170fede9af9174aba71428334ac8f366a4b4f':
  Prevent holding stale Thread pointers

Change-Id: Iac670101765fc5d059a7c22d25fde91b1e5b7281