[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: 62632d8c -s ours am: 0e0a3bf2 -s ours

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

Change-Id: Idfd18d3cb79cff494a5fb3ee13a8745e8b4015ab