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

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