The same change listener was added again before client response (#15284)

Change-Id: Ifbf3c88868615201e382bb0e37298db268510b20