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

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