Merge "Revert "Change Values for Opportunistic Entry & Exit Thresholds""
am: 92e99a6ca9

Change-Id: I7ce860cdca34cf4ff421384fe3071b9f13dc427b