(cherry picked from commit 253f714f6b)
Forward-pick from staging to staging-next. It's quite small rebuild,
compared to what's caused by the parent commit.
(cherry picked from commit 253f714f6b)
Forward-pick from staging to staging-next. It's quite small rebuild,
compared to what's caused by the parent commit.