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

Change-Id: I6a9de7b50e88231cfb4dea9dd47fff83e7d3b84b