Merge proposals dependent on lp://staging/~brandontschaefer/unity/lp.1131646-fix

lp://staging/~brandontschaefer/unity/lp.1131646-fix has no merge proposals.