DO NOT MERGE: Revert "Remove StuckServer using backlog and tests relying on...
DO NOT MERGE: Revert "Remove StuckServer using backlog and tests relying on it" am: d982f318 am: fd06e5d4
am: f3e3cef5
Change-Id: I86cedccdf60b3e5e2a1b3280f4b436501d25669b