Merge "Revert "Pass token to AutoFillUI.""