Merge proposals dependent on lp://staging/~thomas-voss/platform-api/fix-1620553

lp://staging/~thomas-voss/platform-api/fix-1620553 has no merge proposals.