This should provide more coverage for the build from master that
is being dogfooded.
(cherry picked from commit 3b3c02160d)
This should provide more coverage for the build from master that
is being dogfooded.
(cherry picked from commit 3b3c02160d)