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

Change-Id: I00790959d5033eec17756e2281db4204817a0238