Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev