Co-Authored-By: Jinghan Sun <jinghan.sun@intel.com> Change-Id: I01f0e79fbbc85b0e8318baf0fca11fd0036277ec