Merge "Relocate usleep for Thread::Unregister" am: edad2aaa63
am: 8d087954cc

Change-Id: I0fa3090552c620db51ac14da5b53b7270bb9e583