[Fixup] Should be squashed with commit #4

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