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

* commit '2a9cbb61b3d8bae75b3a6e769dbe1c69c563f210':
  Fix wifi compareTo