Merge proposals dependent on lp://qastaging/~cimi/unity8/fix-1368778

lp://qastaging/~cimi/unity8/fix-1368778 has no merge proposals.