Additional rebase fixes

Change-Id: I0bb6c9f96987a7e8b8d91473681f5e208d3b844f
1 file changed