[automerger skipped] [DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService am: 45fcf147c1 am: aee049db67
am: 0a23feb460 -s ours
am skip reason: subject contains skip directive

Change-Id: I6c66366017d47c5cd41a8c3778c710fd7c08f19a