Merge "Add feature flag check for mainline module version."