Reviewed-by: Ray Ni <ray.ni@intel.com>