Merge "Flag guard uses-static-library parsing changes" into main