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

Change-Id: Ia01a95311ee3b38be9a9ce8aa97039294f8a66c2