Merge "Fix style issues in design library code." into nyc-support-24.1-dev