Merge "Final move of AccountTypeManager dependencies."