Merge "Set pending client to null after timeout resumes" into rvc-dev am: a0222398c5

Change-Id: I3a16ed38b1a3dff0a06c85c9e7346ec869c601ad