Merge changes I74045709,I69b9a843 into main am: 34785f4261

Original change: https://android-review.googlesource.com/c/platform/build/+/2883369

Change-Id: I433e784a16e00430beef9d9916f34a0a5dc04f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>