am f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev

* commit 'f197105e3bd83a1f244cb690a1aa615624629961':
  Fix wifi compareTo