Merge "Add more verbose info for wait_for_..._status methods"