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

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