Merge "Disable poor network avoidance by default" into jb-mr1-dev