[automerger skipped] Merge "Define more thresholds for opportunistic data" am: cf2e069962 am: c3bf9392ac
am: d42041fe96 -s ours
am skip reason: change_id Ie7c35e10aeaf791dba49d9f5e881d292068f81f3 with SHA1 73710f8ca6 is in history

Change-Id: I141d3a7d29ba2c7d64dd232097285cefb5cc9f24