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

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