DO NOT MERGE - Merge ab/7272582 am: 2bbaa4f010 am: 23a9661d5c

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1735955

Change-Id: I964556d4deae0eed1ea9ce68577f486107fafa18