Merge "Limit cross user adjustments from assistants."