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

Change-Id: I99900ef8b11141b129274213e92df4a4a0285be2