[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService am: 45fcf147c1
am: aee049db67

Change-Id: Id106829fd802a7efd92562648508b14fa32bce50