Merge proposals dependent on lp://qastaging/~bkerensa/unity/fix-for-934526

lp://qastaging/~bkerensa/unity/fix-for-934526 has no merge proposals.