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

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