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

Change-Id: I4462ca9518e8f445bf5c63d86dcddf1ca7146ca3