cleaning up failed rebase

Change-Id: I5a872881c51d7d66d8d70d9f7a5fb6b2af2b22a8
Merge "cleaning up failed rebase"