1110b03752
Reviewed-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit dac60b8282013d7776667415a429e7ca35efba66)