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