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

* commit 'edc3e6cd6a0d6af4df3d6f07f40de17980b66ad0':
  Sort more instances of wildcard and find