[automerger skipped] sf: avoid assumption remote binder is local am: 4271f56439 am: 58e1ce0b3b -s ours

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

Change-Id: Ide82cc8365da2c7beaa6b0a3a69109d9ac09db0d