Reviewed-by: ray.ni@intel.com