fix rebase error

Change-Id: I9dfc4189daec240221a21a89b9bc42cedec8e343