Include provider names in timeout messages

Also, remove the extra "waiting for".

Change-Id: I5842daecb6b193eb5d6d2d2662dfab89ac8f7344
Merge "Include provider names in timeout messages"