Merge "Populate recovery DTBO offset correctly" into pi-dev
am: 74e8061fd0

Change-Id: Ib313f14ac1acc31a989228cc13b7b38c973e6b20