3af155ceeb
Co-authored-by: Ashutosh Gupta <ashugpt@amazon.com> Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 30c36ef25a335bc123fdae90b3366e582ad1b37a)