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: 4b706dd1
Original change: undetermined
Change-Id: I01f12240ce2ae3caaebde92f2ddd3b04588b2b77