Merge "Have poor network avoidance turned off by default" into jb-mr1-dev