Fix bad merging of patch in 0006

Change-Id: I766ba6f0c7dcc561b8fe304d993166ba3567ef68