Merge "Fix malformed change markers."