Merge "Merge "Remove additional sf transaction when constructing a leash" into...
Merge "Merge "Remove additional sf transaction when constructing a leash" into rvc-dev am: 1b2dfb04 am: 4b706dd1 am: d39d3e80" into rvc-qpr-dev-plus-aosp am: c9ff0f40
Original change: undetermined
Change-Id: Ifcf90ad88a55f839c3009549bd20d0e02c368b5b