7d9c6edadf
Reviewed-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 4d2ae5b398949acfd0b6406abdaeb17456a25c37)