[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: f179514d -s ours am: c4e62361 -s ours am: a78592ff -s ours

am skip reason: Change-Id I552a669113844a6b7ceaba5a1197fd04ca7e18d5 with SHA-1 4271f564 is in history

Change-Id: Ib0903fb787e7018d2bb8ecb2262475c21a42077b