Merge proposals dependent on lp://qastaging/~woodrow-shen/unity/fix-lp-842693

lp://qastaging/~woodrow-shen/unity/fix-lp-842693 has no merge proposals.