Reviewed-by: Ayush Saxena <ayushsaxena@apache.org> (cherry picked from commit 34e2abd811b271708c82bf4d5bedfc9d721366bf)
Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit fefacf2578e58cf7bf96d920f5b01dba66909ca2)