Merge "Disable flag override on standard builds" into sc-dev