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

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