DO NOT MERGE: Revert "Remove StuckServer using backlog and tests relying on it" am: d982f318 am: fd06e5d4 am: f3e3cef5 am: 2f108dad -s ours am: b10d8263 Change-Id: Ib35264fa80ca1aa89c394c70381d21db52578667