Reindent CodeStyle
(cherry picked from commit 02b2d22)