[Fixup] to be squashed

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