Merge "Flag uses-sdk-library parsing changes" into main