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

Change-Id: I1a3b8d3487e2418d6927cdfb24b05e2b3a258474