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

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