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

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