Merge "Correct timeout_dumper to TIMEOUT_DUMPER" am: 2b979929d7
am: 78e05f5dbc

Change-Id: Ie76884646731fdb5619065dfe8fb7b7324e8ac5d