Merge proposals dependent on lp://qastaging/~cypressyew/checkbox/fix-fwts-hwe-attachment

lp://qastaging/~cypressyew/checkbox/fix-fwts-hwe-attachment has no merge proposals.