Fix bad merge

Test: Boot device, hope for the best
Change-Id: I0231874a5f4d7cc8b49cc6f978c17c1af6fa93be
Fixes: 34227241
1 file changed