Merge "Add feature flag for mainline module."