Merge "Make gradle build use debuggable FeatureFlagManager" into sc-v2-dev