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
Original change: undetermined
Change-Id: I0225317f88d30685c74bd8bc9869cac7085f2ef4