Fix some formatting.(cherry picked from commit b320cc799096fb07870c5e5d6d69d485cb1d1ea5)