Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885."