Merge proposals dependent on lp://qastaging/~didrocks/unity/fix-705697-705803

lp://qastaging/~didrocks/unity/fix-705697-705803 has no merge proposals.