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

Change-Id: I20dd4dcfa61025a5eaf0d58dd504b84510a48d5c