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: I2a42c2f0031d575a9b31cce0748d3d8ca296c9a5