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

Change-Id: I9c1d7b75b8e5152996243327fa4c697b7ea8d669