Reland 596ff54335b2a1b393af10657bc4945114f3beed - Split API bundle generation steps