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 am: d1ced292
Original change: undetermined
Change-Id: I27d47c024ce0fac44a7082e2f32090d328f88d47