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

Change-Id: If57a302bbe55808a8b68169f24678caf038a7328