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

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