Merge changes from topic "presubmit-am-7a6e71eafa1b4d2399629cd748f22c65" into sc-qpr1-dev am: ecb6b5c225 am: 27b4deb659

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

Change-Id: I27ee4bea2af0133ffeb8c425f76a31873b4d7ef8