Formatting. No functional changes

(cherry picked from commit 8b6b2ca6eb9d8292c831e315ef7a4c48e520851d)