Merge \\\\"For deadlock test, print out any unexpected exceptions.\\\\" am: 86512030 am: 6f1c3924 am: 458a3038 am: abe436f7 Change-Id: Id2e99e061e6dfd4d104de13550b1100014f130d3