Merge "Revert "Revert "Enable mainline module feature."""