Merge "Support for stopping/starting post-data-mount class subsets."