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

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