sf: avoid assumption remote binder is local am: 4271f56439

Change-Id: If5eac57b39b2679782416edc8c3296e9be358a14