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

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