This is separate from the previous patch - it's just the results of running the script so we can review the two a little independently. We should probably squash them. Change-Id: I838f15cf4a32455a5be20033c8ddc27db6ca15c0
Change-Id: I716c00b7f3cde7df6a220c20a8c0652ccbe8bdce Depends-On: https://review.opendev.org/716908