Running ./scripts/format-source on files checked-in by previous commit (498d8377651d21e86ff642071e6c9b1d585db4cc)