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

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