Fix format error and duplicate modification (because of wrong rebase)
Fix format error and duplicate modification (because of wrong rebase)

google/xi-editor,google/xi-editor,google/xi-editor,google/xi-editor