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

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