Merge "Fix applying patch hunks with trailing context to the start of the file."