Bug: 31068573 Change-Id: I839a06f5190283f56bd04e389a33233a28d60c85 Test: `make dist`
mentioned in commit d075131b