Merge proposals dependent on lp://qastaging/~azzar1/update-manager/fix-lp-1805118

lp://qastaging/~azzar1/update-manager/fix-lp-1805118 has no merge proposals.