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