Merge "Add API to disable account management for certain types of accounts."