DO NOT MERGE - Merge ab/7272582 am: 12e8feff97

Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1735933

Change-Id: I306a4b93529da2c6f1b81e37976e4388e2d9bc59