Merge proposals dependent on lp://qastaging/~zyga/checkbox/fix-1354194

lp://qastaging/~zyga/checkbox/fix-1354194 has no merge proposals.