Merge "Fix rebase patch set and revert change to update Git first"