am 05bb4fed: am edc3e6cd: Merge "Sort more instances of wildcard and find"

* commit '05bb4fed0d0e701ba13fef5f20b57eb1642cc40a':
  Sort more instances of wildcard and find