Merge "Dump more information to diagnose problem."