reset the rebase code

Change-Id: I50bb95e75cd5679667fb6e4053e0d1e60e28f6a5
11 files changed