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

* commit '878072a11a4f481e99cdc499752b72d14a03090d':
  Fix wifi compareTo