Merge "Build flag to API mapping files." into main