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

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