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

Change-Id: Iaa1e0f86d36a6c6fcb10168df38408e315afeaca