Merge "Fix wifi compareTo" into jb-mr1-dev