Merge "Improve reporting of wifi connection state." into jb-mr1-dev