Merge "Don't remove mainline modules if they declare support in manifest meta-data" into sc-dev