Merge \\"Release the thread_list lock while waiting for daemons.\\" am: bbcf0728f0
am: bf3cdef580

Change-Id: I51bdd0135356845c5227767075d914bd713d3fe7