[automerger skipped] Merge "Define entry and exit threshold for opportunistic" am: d748f78231 am: d7f69a3de7
am: 88a17f3b67 -s ours
am skip reason: change_id I6a2a02e03b66dc8ea682fc2483ec71c343563d7a with SHA1 873252fac7 is in history

Change-Id: I2ab26d49a38a8018ef93f794ca896d1c13ac08b6