Merge proposals dependent on lp://qastaging/~yeganeh/unity/fix-for-862996

lp://qastaging/~yeganeh/unity/fix-for-862996 has no merge proposals.