tree 8a910b26d07884180bcef5f5f48781ae642cf99e
parent a973d68fcb0a1538200d562d2ce245237ea0ccda
parent 0139ad11a519443213596ddecba697a23cc0dcbd
author Bill Yi <byi@google.com> 1600492950 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600492950 +0000

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