Merge "Remove StuckServer using backlog and tests relying on it" into marshmallow-cts-dev am: ffe8423f am: a79c863d Change-Id: I3cb88b8de62fe2a3cf50f79bd1aa09d73e0ea920