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