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

Change-Id: I3dad9a80217cc2d33576be4d681168566d991c77