[Fixup] After comments from Christophe.To be squashed.

Signed-off-by: Regis Merlino <regis.merlino@intel.com>