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