Fix merge problems.

Change-Id: I139bb17199a8ff663054d7ba911208d923e7c6cc
Signed-off-by: David Rodero <david@codiguiel.net>