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