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

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