Merge "Populate recovery DTBO offset correctly"
am: a1ae903d00

Change-Id: I4d31081fafad34d8bcc28c42855ac6af8b4f5ce9