Merge "Populate recovery DTBO offset correctly"