Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2

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

Change-Id: Ibfa4188fb6efc1455eb48069ce925adecfc9fd6c