Merge "Make agent threads retain their thread names"
am: 37eeae22a7

Change-Id: I32dcb4239072a0aee8bb0af84ce91bcda9f70243