Fixes broken request listeners (#12056)

Change-Id: I432d901ea3a0d0e3013c045a2048489ee0a41695