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

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