Merge mainline-release 6664920 to master - DO NOT MERGE am: 0139ad11a5

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

Change-Id: I82d51c31e6b05c04d068f6ff2695206707c02b75