am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"

* commit '43861f9de965593340f6a63c270120a7f1a8701c':
  Avoid IllegalArgumentException in Preference.java compareTo()