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
am: 2f108dad -s ours
Change-Id: Ifcaa09fd733c4b14da5611217ac3e543cb65244c