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

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