Reviewed-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 1576f81dfe0156514ec06b6051e5df7928a294e2) (cherry picked from commit 745a2f5ec34d9833f208f2a819026f3cafd6ec21)
Reviewed-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 1576f81dfe0156514ec06b6051e5df7928a294e2) (cherry picked from commit 745a2f5ec34d9833f208f2a819026f3cafd6ec21)