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

Change-Id: I04c567a66da5eeb27ecf18420f17d71ac2278a84