Merge "Populate recovery DTBO offset correctly" into pi-dev