Fix derps to rebase

Change-Id: Iabbba2cffc1adc4d1a662fff0b106a508dee1b09