am 4077a7e5: Merge "Remove SubtypeSwitcher"

* commit '4077a7e52f4016484de914cbfb26e58fe06f3b65':
  Remove SubtypeSwitcher