Merge proposals dependent on lp://staging/~popey/phablet-tools/fix-1360582

lp://staging/~popey/phablet-tools/fix-1360582 has no merge proposals.