Merge "Merge "Build flag to API mapping files." into main am: 25783f370d am: 3458aab4cf am: 497dbe3b5e" into main