am 1d802dc8: am a48ddb6e: am 5e28b3a5: Fix favorite ordering bug (http://b/issue?id=2197247)

Merge commit '1d802dc866673ebb55087423f27d90676d780395'

* commit '1d802dc866673ebb55087423f27d90676d780395':
  Fix favorite ordering bug (http://b/issue?id=2197247)