Merge "Revert "Revert "Revert "Turn on the feature flag for Android S S..."" into sc-dev