Depends-On: https://review.opendev.org/720892 Change-Id: Ie299fa63ab86bb04652424167f81840494473299
and do other changes that allow the manifest to run all the way through.