Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2 am: 74538db684 am: 435f3d3f16 am: 8885ef0529

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

Change-Id: Id01eaa738f1f7e6fdc4581bfccf4521e2f2bd346