fix rebase failure

Change-Id: I5d41bce087465acceedf35aabe221076948b828d