[automerger skipped] Merge changes from topic "recovery-dtbo" into pi-dev
am: adf13a65b9  -s ours

Change-Id: I5faaef48499cd5dc83470707daa30b5b10798722