Merge "dumpstate: set backlog to zero" am: e0268511a0
am: 8b65dbc738

Change-Id: Id0e290a9ae13f15291829d9de1ae326ceeafb59c