Merge "Move some methods out from SubtypeSwitcher"