Merge "Change ConvertWithBp2build signature" into main