(cherry-pick from fc932195ab0c9c00fa0cd9620c60763d978d495b) Signed-off-by: Guo, Yejun <yejun.guo@intel.com>