Merge \"For deadlock test, print out any unexpected exceptions.\"
am: 8651203072

Change-Id: I71a3c2548f807727cacd98a718bd72accc878ba1