Merge "Revert "Enable mainline module feature.""