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

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