[automerger skipped] sf: avoid assumption remote binder is local am:...

[automerger skipped] sf: avoid assumption remote binder is local am: 4271f564 am: 58e1ce0b -s ours am: f3b34f7f -s ours am: f58e368a -s ours am: c2d55d32 -s ours am: e6c141f8 -s ours

am skip reason: Change-Id I552a669113844a6b7ceaba5a1197fd04ca7e18d5 with SHA-1 858c55f7 is in history

Change-Id: I79b4be983ad539281b9330030d04918b066cfce3