Merge proposals dependent on lp://qastaging/~gero-bare/scratch/fix-1637173

lp://qastaging/~gero-bare/scratch/fix-1637173 has no merge proposals.