Merge "Define more thresholds for opportunistic data"
am: cf2e069962

Change-Id: I8426e90c7f8a6b251e3bfdf0e2f3f0cf819fa777