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

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