Merge proposals dependent on lp://qastaging/~mhr3/unity/fix-987781

lp://qastaging/~mhr3/unity/fix-987781 has no merge proposals.