Merge "Improved AbstractMasterSystemService to handle supported user types."