Merge "Follow alphabetical sorting to make list the same with AOSP"