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

Change-Id: Ibdcf4868b2442ab74e0bc61f0ebd85b644724e7b