Merge pull request #31382 from YamunadeviShanmugam/migrate_otp_feature_gates