8c492a1d65
Co-authored-by: Ashutosh Gupta <ashugpt@amazon.com> Reviewed-by: Chris Nauroth <cnauroth@apache.org> Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 84b0455cf869b9acd4cdc293d4a1612cb883e7f2)