Signed-off-by: Aichun Shi <aichun.shi@intel.com> (cherry picked from commit e75c916396821d116e4490f1657b00d576575c04)