Merge proposals dependent on lp://staging/~azzar1/unity/fix-1059562

lp://staging/~azzar1/unity/fix-1059562 has no merge proposals.