Partial-Bug: 1794903 Change-Id: I5d12f9bec2f089674fc601e4cd297f72daefa6f8 Signed-off-by: Martin Chen <haochuan.z.chen@intel.com>