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

Change-Id: I8e5ab63be21b97077ecd263f12581b120e3f85e2