0df4743284
Reviewed-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 110cda3de63e1e483c207085207f5d73d7b8adfd)