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