Merge proposals dependent on lp:~charlesk/platform-api/lp-1216473

lp:~charlesk/platform-api/lp-1216473 has no merge proposals.