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