Merge "DO NOT MERGE - Merge ab/7272582" am: aff8d9e93d am: 5626984392

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

Change-Id: Ibf7c6d621a7a02298b02c40aae32d046e6b5b375