Merge "add additional dump for timeout"
am: 8cde09064e

Change-Id: I7413854112a4d4d2f8e286e7f8be177ec4e282dc