Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds""