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

Change-Id: Id558e6d9f79e35b8814a9fc2ada05737224d1e7f