Merge proposals dependent on lp://staging/~michael-sheldon/oxide/fix-1384357

lp://staging/~michael-sheldon/oxide/fix-1384357 has no merge proposals.