[Fixup] To be squashed with previous commit

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