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

Change-Id: I6c1c95b6a0f4ca9fa0a80a69b455cabff2e271f3