Merge "Fix default population of wifi settings" into jb-mr1-dev