Merge pull request #29783 from ankush/format

style: force auto-formatted code