Bug: 283299388 Test: `m bp2build` and manual inspection Change-Id: Ieec2094e446bb030f30103a7e1a06e35cbdcc72e