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

Change-Id: Ib2f30d6f35ce5fa58b4649cfc0c1138f6cee05ae