Merge "sf: avoid assumption remote binder is local" into rvc-dev am: 51e304e14a am: b4a076204c

Change-Id: Iff6faa9b3dc65c5ee624bd80604229da3adcd343