Merge proposals dependent on lp://qastaging/~azzar1/unity/fix-980924

lp://qastaging/~azzar1/unity/fix-980924 has no merge proposals.