Merge "Define entry and exit threshold for opportunistic" am: d748f78231
am: d7f69a3de7

Change-Id: I9edc56b0b4a4bf382ea567bcb1eeeff47da8e5ff