Merge changes I1e5a8903,I43c6ad22,If9a102a6,I702e619c into main am: e5b8c171c5 am: 132ab4d211

Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784253

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