Merge "Populate recovery DTBO offset correctly" am: a1ae903d00
am: 1bbcf83a39

Change-Id: I1a2f58e05febc9ec5ba996b4fa7a9e502ed5835a