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

Change-Id: Ib2777215d7cafe3f5a7b0b043edee3a3a64af277