Merge "Remove additional sf transaction when constructing a leash" into...
Merge "Remove additional sf transaction when constructing a leash" into rvc-dev am: 1b2dfb04 am: 6ef0f44c am: 36003a8c am: 945d333c
Original change: undetermined
Change-Id: I3dd14dfe9b0b233f2179ff01cec0eccd80db8004