Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1358703 Change-Id: I1d3a25b2768331be6ad6cd7a3695d80f6e7bfebb