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

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