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

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