Reviewed-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 9a0a808338558eb2e8074a7611619a7fc991f994)