(cherry picked from commit d8da98e1dbc0aa5950ea3432836165cfb330922f) Former-commit-id: 1ec9a0b818591d6f7fb1a262c48c9799608d116e