Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> (cherry picked from commit a425eee6)