[automerger skipped] Merge "Change Values for Opportunistic Entry & Exit Thresholds" am: 6d565c7785 am: cff4a105ed
am: d5f6e406cb -s ours
am skip reason: change_id Iaac1641db1d6a07bcce6dd194765c79c83a92070 with SHA1 d90a18970a is in history

Change-Id: Iae9d18640115716eb39df1e914ff4fd6efd948a1