Fixes rebase bug

Change-Id: I1084054758bb6d4fcc0bdb1ed4da77532b99eec6
1 file changed