Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb461

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

Change-Id: I0a9763656107b95ca90e40e7243190868a31337c