[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: fc233338 -s ours

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

Change-Id: I4c9e68376b3982d02be46ac6e53f057bca2f70d2