0d6939ffc4
Reviewed-by: Takanobu Asanuma <tasanuma@apache.org> (cherry picked from commit ca2774477052429a9d8371d66af9b7f7c007acd4)